Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tini: Fix compilation with musl libc 1.2.5 #23929

Merged
merged 1 commit into from
Apr 21, 2024
Merged

tini: Fix compilation with musl libc 1.2.5 #23929

merged 1 commit into from
Apr 21, 2024

Conversation

hauke
Copy link
Member

@hauke hauke commented Apr 14, 2024

Support POSIX basename used in musl libc 1.2.5.

This fixes compilation with musl libc 1.2.5.

Upstream PR: krallin/tini#223

Maintainer: @G-M0N3Y-2503
Compile tested: mips malta be
Run tested: None

Description:

Support POSIX basename used in musl libc 1.2.5.

This fixes compilation with musl libc 1.2.5.

Signed-off-by: Hauke Mehrtens <[email protected]>
@neheb
Copy link
Contributor

neheb commented Apr 14, 2024

Copy link
Contributor

@pesa1234 pesa1234 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As @neheb suggest, I have applied the alpine linux patch and it works
89e1f37

@G-M0N3Y-2503
Copy link
Contributor

It's been a while since I've looked at the patch system in OpenWrt. Is there a way / should we only apply this patch for musl?

Otherwise, 89e1f37 looks good to me.

@pesa1234
Copy link
Contributor

It's been a while since I've looked at the patch system in OpenWrt. Is there a way / should we only apply this patch for musl?

Otherwise, 89e1f37 looks good to me.

Yes only this is ok

@neheb
Copy link
Contributor

neheb commented Apr 21, 2024

I don't like this patch as it includes dynamic memory allocations, but it's probably best to do it this way to be compatible with both glibc and musl.

@neheb neheb merged commit ddd3794 into openwrt:master Apr 21, 2024
12 checks passed
@hauke
Copy link
Member Author

hauke commented Apr 24, 2024

Sorry for the late answer.

I think both solutions work. The code works with Alpine patch, but it is not a compliant version of basename.

The upstream project looks dead to me.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants